(to merge after 0.13.1, due to the big number of changes)
This will create a new commit in order to revert the existing changes.
