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

Originally created by @intrigeri on #15627 (Redmine)

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

Edited May 15, 2020 by intrigeri

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