Upstreamq

https://jira.spring.io/browse/SHDP-167