This patch is unrelated to the current PR, and should (if applicable) be submitted in a separate PR