Backport of gh-4098

Comment From: spring-builds

Fixed via f486f89b1bc94018d67c564c0abc2ada2eda38e6

Comment From: spring-builds

Fixed via 13196718518ed7868a4e756940f7f1f9834c1b94

Comment From: spring-builds

Fixed via 8746109d11f6073513947f2c77b5db0b34d7579f

Comment From: spring-builds

Fixed via 1ee0788d003d2c01f314351f098080ef755e663d

Comment From: spring-builds

Fixed via cc2b0cf17dad3ff2439d580a8f8173fd0ebad8bc

Comment From: spring-builds

Fixed via 6594c2b5d343c1bb235f4e5c989902986a58c341

Comment From: spring-builds

Fixed via 39ea61d3cd26d2cd1a4b960a1c1bcd31a0a5eaff

Comment From: spring-builds

Fixed via f81a2f6897d718fc7951ef73bc0ae76fdebdebe1