Pull requ: Sprint 39 small changes