Issue #5703: Add customwidget support

Issue #5703: Add customwidget support