GoodWilL stbb#867

GoodWilL