am 5458065f: am 456688bf: merge from open-source master