Replace check constraint with trigger for pending fixes
Merge remote-tracking branch 'upstream/master'