FLUID-5279: Added a unit test to demonstrate FLUID-5279 issue.
Merge branch 'master' into FLUID-5279
FLUID-5279: Stopgap fix for FLUID-5279 (old renderer will be destroyed, no better is warranted)
Merge remote-tracking branch 'amb26/FLUID-5279'

* amb26/FLUID-5279:
  FLUID-5279: Stopgap fix for FLUID-5279 (old renderer will be destroyed, no better is warranted)
  FLUID-5279: Added a unit test to demonstrate FLUID-5279 issue.
FLUID-5279: Fixes minor typo in comment.