Code

Applied patch #1502063