Merge "Fix wrong condition for blocked status tracking wtf log" into main