Revert "Merge remote-tracking branch 'origin/development' into DF-5249_removed_ImageMagick"

This reverts commit 2869c1a38817797418bdd3769fbae5e7e17893db, reversing
changes made to b1539398c96550da489a8c0057724223e94d8611.
merge development