Merge "[cleanup] Remove unneeded virtual from a function" into main