Depends on !38 (closed).
Second and last step to resolve T2126.
Migrated from D2454 (view on Phabricator)