merge regression fixes from partdev