Merge branch 'ps/contains-id-error-message'