antoniop
committed
on 28 Jun 18
Exploit new api where appropriate