Merge "Add NotNull DB Constraint to operation field"