B1 merge with master