[DB] Applied latest core patch changes