Yes, it can be merged. I'll do it in my next commit.