[ISSUE #7029] Add a config to determine whether pop response should return the actual retry topic or tamper with the original topic#7030