Rescue topic protect rho

Bug fix to protect rho consumes in case rho corrections are not used.

This Pull Request is just a clone of #2694 that was closed by mistake by the original author after having got all necessary signatures...