Merge "def-tool: Add APEX module support"