Merge branch 'hotfix/1.3.1'
manually copied notes from app to dist
manually merged hotfix and head