Finalizing changes for 1.10