Synced to 1.4.4-dev