MT#4405 prepare 2.004+ramoptimized.2 for backport to 3.0