Fixed bug with multiple active context menus
Merge branch 'bug-fixes' into develop