2017 Spring issues

2017 Spring issues