merge regression fixes