[#856] v3 code review