Hbjs helper2

merge from master