Overlap fixes from Alessia.
Merge Alessia's work with HEAD.
Fix a typo.
Overlap fixes from Alessia.
Fake conditions for Phase 1 extended pixel.
Fix ovelap with new beampipe.
Merge pull request #2700 from ianna/overlap-fixes-in-totem

Overlap fixes in Totem