merge updates from geni_api branch