Remove codes duplication.
Merge pull request #1016 from akbargumbira/fixing_bad_codes

Remove codes duplication.
Merge remote-tracking branch 'origin/develop' into fix_wizard