Gittrac #4115:  Started on implementation.