#21895 Upgraded to use latest widget framework.