CDB-2638 #resolve - added contextual message when query is applied
Merge CDB-2638 into release/2.13.2