is_the_job bug and POST regeneration

Change-Id: Ida97760a2b730afae78494764ce39519dc6ba4ee
Merge "is_the_job bug and POST regeneration"