Update the self-protection checks adopted by KSPP (part I)