keep menu items after completion
Merge branch 'DA-427' into unstable

* DA-427:
  keep menu items after completion