Merge branch 'hotfix/pianosedittoolmissing' into develop