Merge branch 'rj/add-chmod-error-message' into next