Updates
Merge branch 'jon' into sprint8
Merge branch 'tao' into sprint8