basic_api - Resolve remaining conflict with master