Fixed bug on materializer that skipped a result
Merge branch 'develop' into bugfix/materializer
Merge branch 'bugfix/materializer' into develop