Pushed as 7bf6a6f9db23980d2e2508842dcb303a9910b839 to master.

Thanks,
Oleg