Add additional span to 2nd copy
Merge branch 'develop' into staging