Revert "Revert "Merge branch 'feature_e' into development""

This reverts commit e8b1d1e2400df98a999d177cb49679b7e5dff42b.
fixes for feature_e pulled out of release branch