Azaezel Merge branch 'fix-shapebase-animation-networking' of https://github.c…