commit hrb-109

Merge from hrb-109