Merge "Unlock non-secure users automatically (1/2)" into main