Merge r3299