Merge commit '127f34634f86c8f0e51710f375c2a87abdf299e4' into staging
Allow to remove user from client.cfg