Cherry pick from refactor: 64700ed9b4f1cb6ad62f300ce627f1c6670c8cce
This should work already in the profiles dialog. please check this on master
This has been completed.