Code

Applied patch #1505556