merged anonymous mode fix from RC_0_16
merged test from RC_0_16
merged test_privacy updates from RC_0_16