Issue #5703: Add customwidget support