import CoreList changes from v5.18.1