IMPORTANT: branch 9.x-1.x should be created and this merge request should use that instead of 7.x-1.x