Update internal as prepare of harmonizing pull requests