merge from trunk

Upgrade to 1.2.3
purge the sensitive data