Merge "setDefaultImpl aborts on a second call" into rvc-dev