code base update to July 15