Merge "Allow self blames to be trusted" into rvc-qpr-dev