Modal diaogs: move attribute to settings conversion to core
resolved conflict