[trunk] update to r202818