Merge branch 'development'
Add note about 5.5