Reference instead of copy keyframes to avoid bloating
Merge remote-tracking branch 'upstream/master'