Fixed the standard settings to comply with the infrastructure Former-commit-id: 9ab888c2df
9ab888c2df