Merge branch 'release/0.9.5' into develop
Manually turn on-page menu on
updated version
Merge branch 'release/0.9.6'