Merge with latest version of spring integration extenstions