Found that bugs are only occurring on this branch