Fixes http://jira.jcatalog.com/browse/WCM-251
Merge remote-tracking branch 'olemi/space_del'