Based on this PR discussion #867.
Based on this PR discussion #867.