Merge branch 'hotfix/print_bug' into dev