Merge branch 'fix/masto-put-settings' into 'develop'