diff --git a/python/gui/auto_generated/qgscheckablecombobox.sip.in b/python/gui/auto_generated/qgscheckablecombobox.sip.in
index f4d5be71221..db9d202ea69 100644
--- a/python/gui/auto_generated/qgscheckablecombobox.sip.in
+++ b/python/gui/auto_generated/qgscheckablecombobox.sip.in
@@ -66,7 +66,7 @@ no items selected.
 
     void addItemWithCheckState( const QString &text, Qt::CheckState state, const QVariant &userData = QVariant() );
 %Docstring
-Adds an item to the combobox with the given ``text``, check ``state``
+Adds an item to the combobox with the given ``text``, check ``state`` (stored in the Qt.CheckStateRole)
 and containing the specified ``userData`` (stored in the Qt.UserRole).
 The item is appended to the list of existing items.
 
@@ -122,6 +122,8 @@ Toggles the item check state
 .. seealso:: :py:func:`setItemCheckState`
 %End
 
+    QgsCheckableItemModel *model() const;
+
     virtual void hidePopup();
 
 %Docstring
diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h
index a0e878993c9..baf721c493d 100644
--- a/src/core/qgsfield.h
+++ b/src/core/qgsfield.h
@@ -81,7 +81,9 @@ class CORE_EXPORT QgsField
     {
       None = 0, //!< No flag is defined
       Searchable = 0x1, //!< Defines if the field is searchable (used in the locator search for instance)
-      DefaultFlags = Searchable, //!< Default set of flags for a field
+      Wms = 0x2, //!< Fields is available if layer is served as WMS
+      Wfs = 0x3, //!< Fields is available if layer is served as WFS
+      DefaultFlags = Searchable | Wms | Wfs, //!< Default set of flags for a field
     };
     Q_ENUM( ConfigurationFlag )
     Q_DECLARE_FLAGS( ConfigurationFlags, ConfigurationFlag )