Merge branch 'hotfix/0.11.4'
Merge branch 'release/0.12'
adds history button to the status box
Merge branch 'hotfix/0.12.1' into develop