Merge "Refactor weakly referenced callback keep rules" into main