Merge remote-tracking branch 'origin/feature/7970_alternative_cuboid_xml_definition'
Revert "Merge branch 'feature/8057_remove_loaddetectorinfo_dec'"

This reverts commit 7bff58ace35899aee71a7301d14c435a843f541a, reversing
changes made to 2d73e1a5b98f0926220356f00ecd981b1fb33246.
Merge branch 'feature/8180_revert_loaddetector_info_changes' into develop