fix
Merge branch 'feature/fix-fromJSON' into feature/custom-jsstg-cannon
build