cherry picked vom 1.4.13 + fix condition commit