Merge "Add new namespace of pffft to make the upgrade work" into main