Cherry-picking for pull request
Merge upstream changes
Fixed travis building errors
Fixed travis building errors (again)
Merge pull request #34 from CompassionCH/7.0

get_bvr_ref refactoring