Merge "Internal version of isChangeEnabled." into rvc-dev