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