Merge branch 'sprint61'