antoniop
committed
on 30 May 18
Use api to avoid join