fix an memory leak (hopefully...)
Merge branch 'feature-portal' into development