Merged errors_and_callbacks branch into master