Merge "Modified mv prediction." into experimental