Merge topic 'remove-spaces-wc' into setup