Merge "Fix build." into kraken