Pushed to master with modifications as
0734c42da2f60b7598cca8e88950aaf5cc1fd5af.

--
Oleg