am fefe7a22: Merge "Fix build." into kraken