Fix merge conflicts/reference for 39420

Stewart Martin-Haughrequested to merge
smh/athena:TileIssue_20201218_smh into master

!39420 (closed) with an extra commit to fix references.

Merge request reports