[2021] Client settings profiles - bring them back plz

We have decided to roll back the settings profile changes and hope to have this released tomorrow (Wednesday 31st March).