U/pgee/dm 1067

Pull request for review.