refactor_master

Karma: 1038