Final changes for 1.4.7