Merge master into release/core_bican_bg/bican_bg
#195
Merged
master into release/core_bican_bg/bican_bg
#195