remove null value
refactoring indexbuilder intreface
Merge branch 'master' into CORONA_1_0_0