Pr 288 for 2 14

This is #288 rebased, squashed and fixed up for 2-14-maintenance.