Squashed commit of the following

commit 3d6deb2d 
Author: David Meng <xlmeng@amazon.com> 
Date: Wed Sep 28 2022 10:51:26 GMT-0400 (Eastern Daylight Time) 

    Upgrade springframework
32 jobs for DavidMeng-UpgradeSpringframework in 44 minutes and 51 seconds (queued for 2 seconds)