Issue #2325435 by gdaw | mxlav: Fixed can't create features.
Merge pull request #2 from wet-boew-wem/7.x-1.x

Merge Fixes from 2.x branch to 1.x branch.