Enhanced functionalities
Merge branch 'MH-745' into dev