[No reviewer required] sto940 code review feedback