cherry-picked from 2.5 branch, camel-2.11.1 update