manually merged changes from hdbLoader branch