Merge "API review: make exception class and Builder final" into rvc-dev