Merge branch 'development' into case-3976
case 3976 - Add features_override module.
Merge branch 'case-3976' into development