Merge pull request #7752 from kPherox/develop