#21895 Updated to latest widget framework.