This issue is fixed by the changes in [54c35183c2d1427d] and OBE by the changes in [d3d16ea77fa810d8].