Updating BEF with master

merge #2967 first