Merge "Check condition presence before updating callbacks." into tm-qpr-dev