Commit before 1.7 updates