It can be merge, testing will be easier afterwards ...


Reply to this email directly or view it on GitHub.