Updating the "Defined" Record_Status break is own status  refs #599
Merge remote-tracking branch 'origin/dev' into dev