This bug is fixed. It can be marked as pending when the merge requests for the two blocking bugs are accepted.