Merge "Test user visible extra spec"