Merge branch 'sv/typofix-apply-error-message'