Code update to rev 2b3a376376dfb15ae4a1940b70261fc147599ae8