Merge "Setup files to support PM Mapper Publishing"