Merge pull request #2113 from and-ers/develop

Easy optimization