Merge branch 'master' into FLUID-4907
Merge remote-tracking branch 'justin/FLUID-4907' into FLUID-4907
Merge remote-tracking branch 'yura/FLUID-4907' into FLUID-4907
FLUID-4907: Partially fixed the aux builder test failure.
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907