https://jspace.atlassian.net/browse/JSPACE-24
and some other notices/strict errors fixed