OpenRift - 2022-10-03

PLEASE CLOSE! Put this ticket on the wrong branch, apologies.