Merge "setDefaultImpl aborts on a second call"