Merge Joona's bishop+pawn tweak