Revert "Remove deprecated settings import"

This reverts commit c5d2e9a2d92faf224dc9a429e1535f17e1ad81d7.
Merge branch 'master' into production