merge r503