Merge "API module manager and help rewrite"