Merge "Switch to release build compatible compat override API" into sc-dev