Merge "Remove a module-lib API" into sc-dev