Merging changes from BCH_CHB branch