#21895 Updated to use latest version of the widget framework.
Merge branch 'master' into perforce