Sync file-based PIPs separated to account for slow machines
Fix forceSelection for i18n text option types
Merge branch '2.0'