Sprint 12 changes #161, 165