Merge with custom_widget branch