PIM-3141: Changed comment mapping