fix RT 4.2.11 merge, RT#13852