Use new libmodule features
Merge commit '75e018597439dfa171f883afff01f86d4e8c6b18'