mentioned in merge request !1307
merged
mentioned in commit 7b667517
This will create a new commit in order to revert the existing changes.
