merge tag v3.4.98, module whitelist, revert prima to stock