Comment query for urgent issues. Not working as expected yet

Change-Id: Ia366fb0ce10ceb9f7255a0d875008143c7f401f4
Merge "Comment query for urgent issues. Not working as expected yet" into production