https://issues.apache.org/jira/browse/CAMEL-16850
CEQ-1765 Backport CAMEL-16865
CEQ-1766 Backport CAMEL-16853