Merge "Add PM Mapper as subscriber to default PM feed"