sync internal changes (#2525)