refacactoring
Signed-off-by: dstoianov <stde@ciklum.com>
Merge remote-tracking branch 'origin/master'
qqqq