Merge branch 'note_queue'