Merge "Support Apex with services in containers"