Task #123 jobs

Change-Id: I5d75124074926f666f22694b5bcf43fb48cfb16a