integrated changes from kraken