Merge remote-tracking branch 'origin/FLUME-1787' into FLUME-1787