Merge branch 'r-sprint2' into development