Merge branch 'develop' into 00019-User_page
task #00019-User_page: Minor fix
Merge branch '00019-User_page' into develop