Merge branch 'hotfix/menu_http_309'
Merge branch 'develop'