am bb7928cc: merge from open-source master