Merge "Separate modules for API docs and API stubs"