Incorporate #754344
Update watch location