Merge pull request #3760 from Skyyrunner/develop

Fixed #3756?