Merge "Blendshapes fix (still missing tests)" into devel/master