PDETS-344 - Step 4 to 8