refactor_master

Karma: 1042