Merge "add lazy service functions to #apex"