Merge "PM Mapper output - granularityPeriod issue"