Merge "updated commit for Auto 6.1.1"