Merge branch 'jh/error-removing-missing-note'