For review comments for DM-1468