Apply code review markups for SFR462605