Revert "Merge branch 'develop' into mergefix-feature28"

This reverts commit e5110a2972ab23f5e6df5135a9c13d4507829900, reversing
changes made to bff427481af483649ea81c67c6bf922d85420bb8.