My inclination is to leave this for now (so we can get this merged and tag the RC 'soon'), but I will leave that call to @pelson