Merge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev