antoniop
committed
on 27 Jan 23
Rework api to avoid extra checks