Merge "CommonWidget class DB constraints"