https://jspace.atlassian.net/browse/JSPACE-28