Merge "Prevent local reference table overflows" into kraken