b2 also modified common-file

merge?