Update Spring 3PP versions - Cherrypicking & adapting from master