Salome HOME
Fix regressions after resolving issue #19890 (part II)