Merge with feature/tpcc-stored-procedure3 (mrks) and fixed some tpcc test fails