Pull req: Sprint 39 small changes