Merge "Added logging in setup file - PM Mapper"