force merge: camel-integration to master