Merge "rename TRIGGER_CLEAR_RAT_BLOCK to _BLOCKS" into main