Ideally, we should also solve #2 (closed).
Related merge requests:
added T: task label
changed the description
mentioned in commit 62b7cd60