Merge team/russell/frame_caching