#21895 Updated to use latest version of the widget framework.