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