Merge pull request #2332 from BrzVlad/feature-div-with-mul