Merge "Add an option to allow/disallow degenerate DICE chains" into main