This PR generated automatically to merge dev with rel-7.0. Please review the changed files before merging to prevent any errors that may occur.
