antoniop
committed
on 09 Feb 22
Merge if conditions