Merge branch 'chores/note-handling-move' into 'develop'