Got some off-line feedback from Alberto, resolved a small conflict, and applied patch with minor revision in r27289.