Merge master to fix regression issues