Merge branch 'fixtu-att' into autostaging-commtrack-items-issue