#22466 - Updated to use widget framework 0.1.20