Pulled down staging version for july ammendments