r4273 Initial implementation of #389, section 3.3.