updated apis from master(s)