Merge branch 'sprint82'