merge from geni-api branch