Merge "Spec for elastic API exposure"