Revert 361ec38dc0facf7b92c9090e3f137f6582ce5891
Merge branch 'master' into MPDX-217
Tags in follow up dialog