refactor_master

Karma: 997