Juno is EOL upstream, we need downstream only patch similar to https://review.rdoproject.org/r/#/c/7096/
After closer checking this does not impact OSP 6