*more changes on CORE-1543