Pushed as 2ad283aa03e2983ca63209eac2b35af6fde68e78 to master.

Thanks,
Oleg