Merge branch 'ps/config-error'