patch from roderik

Wolfgang Zieglerrequested to merge
issue/rules-3161036:3161036-currentpathcontext-inadvertently-bubbles into 4.0.x

Closes #3161036

Merge request reports