@snopoke 
Ok, I will check once again all code where can we use this. In one place I changed already:
https://github.com/dimagi/hq-pact/pull/67