Merge "Test that the password isn't truncated (again)" into main