Updated from UI library.
Merge branch 'master' into release
Updated to version 2.1.