Merge "Fix job duplication bug" into nyc-dev am: 24fb1f6
am: 205ec38

* commit '205ec3811177394bd880213a11693ea72a74752d':
  Fix job duplication bug