Revert "Revert "Merge branch 'bugfix-13026' into develop""

This reverts commit f92c09178fc681765621a14eabc73cfe9d3f2569.