Manual update of BG from MPN/exp branch
manual update from MPN/exp part 2