Merge "RefBase: update sp and wp to allow constinit" into main