BRANCH 4.3: add site flag to upgrade and numerous small adjustments