feature/14594-asp-gui FTBFS due to merge conflicts

Merging the base branch (devel) fails due to merge conflicts. Can you please fix this?

Original created by @intrigeri on 15627 (Redmine)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information