Update to sprint-39

Update to sprint-39