[CDFS_NEW] Address review comments: