Add some focus

Vadym Tishchenko requested to merge vadym/add_focus into master

Merge request reports