Merge from v1.2 of main branch#91

jetyu merged 11 commits into

legacy/developjetyu/NoteWizard:legacy/developfrom

mainjetyu/NoteWizard:mainCopy head branch name to clipboard