refactor_master

Karma: 922