[sprint 45 some commit for team members jul 23]