Code

Applied patch #1501375