Merge changes from topic "am-9a25525a4abc477ead725647dc5e8031"

* changes:
  [automerger skipped] Merge "Handle invalid data during job loading." into tm-dev am: f8449a01 -s ours am: 7f487ce5 -s ours am: 07d6a9cd -s ours am: 965d1eef -s ours
  [automerger skipped] Handle invalid data during job loading. am: 8c8d1c0d -s ours am: 25c49dd6 -s ours am: df6f21f6 -s ours am: b635b2ab -s ours