Develop

update master with v1.7 from develop