a713c0d366
This commit also add a FIX and a test for toolbar-popup-menu-options which had a behavior slightly specific.