I had a similar issue upon upgrading. The fix was to simply eliminate the common_orders_functions file. The coding is, basically, repeated in the new SO ver. 4 files elsewhere.