merge branch: feature/better enum inspection