Sync up to b3 release