2.2.7: all previous fixes