Closes #3365929 (this commit include #3256578 patch #9)
added 1 commit
Compare with previous version
mentioned in merge request !5