[AMOS commit] Backport MDL-29872 to 21_STABLE Committed into Git: 2012-11-06 11:58 UTC