Merge "Create Apex Adapter"