Fix lazy copy-pasting
Merge branch 'dev'