SCRUM-1869 - merge changes