Fix for https://issues.apache.org/jira/browse/CAMEL-8103.
Merge remote branch 'origin'