merge from HADB:master