New merge  from master 1.7.0