Merge branch 'development'
Merge branch 'development-v5' into master-v1
Fix for bug in ansi string support