Pushed as 316abe24c1..59433ccdc3 to master.

Thanks,
Oleg