[junjiang2] commit remain changes