Refactored internals
Merge branch 'release/1.2.1'
Merge tag '1.2.1' into develop

Refactored internals