fix #3552: NPE in menu handler
Merge remote-tracking branch 'origin/release'