merged
mentioned in commit 2502b3e9
This will create a new commit in order to revert the existing changes.