CLD-1313 update from production for PNG conversion slowness