Release 1.3.5
Porting last commits from v6.5

Merge branch 'master' into v6.6