Sync with local repo used for 1.5.0 and earlier