The commit 5a3b504e was added to the esr78 branch after we did our rebase. While we are doing a new release based on 78.13 for other reasons, we should rebase it on this commit.