Merge "Add a developer setting for conversation enforcement" into rvc-dev