finish 5.1 compatibility
Merge branch 'development'