OPSMN-1479: Addressed timestamp issue in AQ as well