Release 2.5.4
Porting last commits from v6.5.

Merge branch 'master' into v6.6