Any ETA on merging this PR? The bug this fixes is a blocker for us, so it would be nice to get it merged.