Merge pull request #3970 from jansupol/spring4320

Update Spring version to latest