Merge "Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev am: 47cfac6803" into nyc-mr1-dev