Merge branch 'bb/redecl-enum-fix'