That didn't go as planned. Manually mergin in @toin0u's pullrequest #379.