am 4000e06e: Merge "Metadata construction optimization" into kraken