Merge "Do not move PDF content as the content is already moved." into nyc-dev