*more changes on CORE-777