Howard fixed the problem in HEAD. I've applied the patch to my local REL_ENG_2_1 installation and the problems seem to be solved. Thanks!