Revert "Revert "Merge branch 'DIALOGITEMS'""

This reverts commit bb8902aee1a08e969b32b54e2d22b4228d36bca6.