NH4.0 merge

NH4.0 merge to develop