Closes #3422683
changed title from Add changes from patch #4. to Add changes from patch 4.
added 1 commit
Compare with previous version
6.1.x
7.x
changed target branch from 6.1.x to 7.x