The evening commit from GL workplace. The changes which are directed at
improvement of high-speed performance have been finished. Also, unit
tests have been updated.