r14 reflect master's update to r13 by hand