Merge branch 'jn/stripspace-wo-repository'