re #940 - Extended 5904 override
re #941 - Added override option
Merge branch 'feature/941-override' into staging
Merge branch 'feature/940-5904' into staging