Pushed as a84f26f0af..61656d3f61 to master with minor modifications.

--
Oleg