merge r165