SWC-36 (wiki support), SWC-348, SWC-357 (rework widget framework)