Merge \\\"Add tests for varying linking by location\\\" into nyc-dev am: 74079c6d92...