Fix merged to trunk and core-8-6-branch, with new test case menu-38.1