Merge branch 'jk/error-const-return'