Code merge v1.7 a3

Merge into master