Intermediate commit. Still testing options to improve small message performance.