Flatten code down a level
Update dependencies
Bump version
Merge branch 'release/3.5.3' into dev