merge from geni_api