Merge pull request #8621 from MerakRC/master