Merge branch 'cherry-pick-0497d7a4' into 'release/0.16'

Merge spring-webmvc changes to release/0.16

See merge request !241
30 jobs for release/0.16 in 47 minutes and 51 seconds (queued for 7 seconds)