Merge branches 'dev' and 'master'
Merge branch 'dev'
Merge branch 'dev'
fix typo in comment
Merge branch 'dev'
fix missing reek checks, fix duplicate rubocop call