Merged in changes to soar_db and soar_module from 9.4 branch