fix/workaround for feature name (needs checking for edit)
Merge remote-tracking branch 'origin/develop' into develop