PR #1764 is waiting this PR to be merged? Any update on this issue?