r43880 (fix #0036528) and r44093 (fix #0034416) hope it is not too late to merge them. BTW: it first time I try to post messages to mailing list, if this one duplicated, please ignore first one.