The pr mentioned in Comment#3 is still open. The patch passed the test on obs, will submit as long as the pr is merged.