We moved to 4.24 and that fixed the problem. I don't think there will be a fix in 4.23.