1.7.0 - synchronise with  1.7.0