Merge "Fix problem with post install job"