Merge "Ensure policy has no absurdly long strings" into rvc-dev