pimd: Merge pim-only branch.