Merge branch 'master' into FLUID-4927
Merge remote-tracking branch 'cindy/FLUID-4927' into FLUID-4927-b