Updated with PM Review Feedback from tickets cwrc-29 and cwrc-34.