Pushed as fd116510b2..eaccfececd to master with minor modifications.

--
Oleg