[MERGE] branch merged with trunk-menus-improvements-idea-jap