test pr #5098 and merge confilct