Merge back new material for v4.7.