[disc] Unify element boundary types of box/diamond to cvfe

6 jobs for !3250 with feature/reduce-box-diamond-code-duplication in 6 seconds
latest merge request