Merge "Use static flag instead of impl" into main