am b658cc42: Merge "Prevent local reference table overflows" into kraken