Merge "Final polish of the interrogation feature."