am 0659dd56: am c8c8c050: merge from open-source master