Removed a comment to test branch merge
Merge branch 'production' into testing-cloud