FLUID-5126: Fix for "three on a match" listener corruption with repeated demands blocks
Merge remote-tracking branch 'amb26/FLUID-5126'

* amb26/FLUID-5126:
  FLUID-5126: Fix for "three on a match" listener corruption with repeated demands blocks