Sync to pre 1.4.0