Merge branch 'pu/qualified-modules' into wip