fixes #1330 (closed) and some issues SPW had
added 1 commit
Compare with previous version
enabled an automatic merge when the pipeline for 88bce57c succeeds
merged
mentioned in commit 23657e88