Merge "Adding policy/pap job"