fixed (I hope) bug causing failed menus
updated to v2.3.3
Merge branch 'release/v2.3.3' into develop