Settings correction.
Merge branch 'support-post-office' into develop