[disc][cleanup] Reduce code duplication with box and diamond
Reduced code duplication with box and diamond. This will make also !3253 (merged) easier.
Notes:
Depends on !3248 (merged) to be merged first
Edited by Timo Koch
Reduced code duplication with box and diamond. This will make also !3253 (merged) easier.
Notes:
Depends on !3248 (merged) to be merged first