12 Commits (nc-fix/duplicate-code)