Fixed language limitation in library over view
Merge branch 'development' into release