Merge "WidgetFileApp class DB constraints"