Pushed as 4e2b6d5585..79bbd178f1 to master with minor adjustments.

--
Oleg