Sprint 24 to dev