Issue 7685 - support for manual upgrade