Diagnose problematic ContexMenu
Merge branch 'master40'