3.5.4 support
Merged branch 'master'