Merge "Using resource override instead of code-swap for ApiWrapper" into main