Merge branch 'FLUID-5293' into FLUID-5358
FLUID-5358: Use of free functions and identity in model relay
Merge branch 'master' into FLUID-5358
Merge remote-tracking branch 'amb26/FLUID-5358'

* amb26/FLUID-5358:
  FLUID-5358: Use of free functions and identity in model relay