Merge branch 'master' into notes-search