TUP-2284:fix the multiple add pb for the menu item action and improved
the code.
Merge branch 'maintenance/5.6'