Synchronize with 1.4.2