Merge branch 'hadoop104' into develop