Changes for v2.0.17 release
Improved upgrade invalid message