Merge branch 'release/0.12.10' into develop
Rename function and refactor
Roll commons version 0.12.11
Merge branch 'release/0.12.11'