Pushed as 93b19868e6..b315f4d575 to master with minor modifications.

--
Oleg