Refactor code
Refactor code
Merge branch '1.2'