Minor adjustments
Merge branch 'MH-780' into dev