please target any fixes that should be cherry-picked to

1.3.x

at https://github.com/pantsbuild/pants/milestone/10