Notes Upgrades
Merge branch 'Notes'
Remove Notes security_level
Minor bug fixes