antoniop
committed
on 28 Jun 18
Apply new api where appropriate