Merging latest wip/api-modules changes