WCS pull request to master

WCS pull request to master as requested by Stuart