Merge changes from topic "refactoring"

* changes:
  Refactoring for magnification [2/n]
  Refactoring for magnification [1/n]