With &3835 (closed), this issue should be done at the latest in %13.6.
cf. #34 (closed) (!103 (merged), !107 (merged))