Merge change-id Ifd34d39b9b1393dc3bb8d83f1fc25efc8a34683b.
My first patch merged in official source.