Merge "Enable lockout timeout" into main