S123333 new branch fromGabor

..