performance improvements though recompile with khepri V0.21.13