Refactored code
Merge branch 'unify-bkp-11-8'