Code

Applied patch #1501134