Migrate more patches from master