Further Changes to v1.12
Further Changes to v1.12