Merge "Allow overriding disabled changes in final release." into rvc-dev