Merge "Register callback outside of constructor" into rvc-dev