[Upg] Cleanup
[Upg] Cleanup
[Upg] Doc
[Upg] Cleanup
[Upg]Less strict check