WEB-2896 Remaining work on Custom profiles