Merge branch 'hotfix/fix_underscore_class_name_2'
Merge branch 'release/0.8'
whodunnit
Merge branch 'hotfix/whodunnit' into develop