#1468
Merge branch 'development' into eliza_privacy_1673
negotiation test fixed
Merge branch 'development' into eliza_privacy_1673