Merge branch 'hotfix/linzt'
Merge branch 'release/r16'
Merge branch 'release/r17'
navbar fix
Merge branch 'hotfix/hfx1' into develop