Salome HOME
Merge remote branch 'origin/bsr/resmgr'