- change default error handling to reject record on error
Merge origin/master