Added and organized changes for 1.12.0