Code

Applied patch #1505765