Merged master into fix-abstraction after a long time.