Merge "Revert "Revert "Optionally (dis)allow degenerate DICE chains in ..."" into main