BRANCH 4.3: lots of fixes to handle multi-site