am dad488c3: merge from open-source master