SCHEMA-681: Updating files to fix the reported isssue.