Merged to master and freeze for precsie version

Merged to master and freeze for precsie version