Final changes before 1.3 push