Merging in panRight changes