Original PR: https://github.com/OpenDevicePartnership/embedded-services/pull/790
Original PR: #790