Merge "Guardrail for dimension in condition in duration tracker." into pi-dev