This has been implemented in commit [952ef184e63a5bc4] and [b08bbeb9a11fd604].