Building against 3.21.x