Synced changes between 1.4 and 2.0.