Merged in changes to callback, consistency and io_soar from 9.4 branch