Salome HOME
Merge relevant changes from master