Fix gathering inconsistent behavior when press back

Martin Santangelorequested to merge
fix/gathering-back-button-issues into release/3.12.1

Merge request reports