Merge branch 'release/0.9.6' into develop
use add route from note type
bumped version
Merge branch 'release/0.9.7'