Code update to rev 524ab9cf16b85dce25e85ccfc6da6db591b67292