This issue is resolved by the changes in [3df2605920050e57].