Code

Applied patch from psc - 16492