(cherry picked from commit 2352d202)
Co-authored-by: Oskar Myrberg (Ericsson) oskar.myrberg@ericsson.com