Merge "Added support for publishing PM Mapper"