We haven't cherry-picked upstream commit 605405c6 which introduced a strjoin macro that adds the NULL sentinel automatically so we need to do it manually. Closes: #851210