Merge branch 'sprint45'