Merge remote-tracking branch 'gb/hadoop104' into develop