Restore job type checking

Created by  Eelco Dolstra  on March 4, 2020
ZJPNQTVCQJS2HZD2AXQ4OPBSVH5JTQX7NTNIOOMGZXQMJQS4Q5PQC
Change contents