merge fix 5.0.2