Added the SRQs for CPRs 17-31
Resolved merge conflict, step 1
Resolved merge conflict, step 2