Spring update (16/17)

Spring update