Merge "Moved ref frame calculations"