Fix for migrated/merged instances (update)
Merge branch 'refs/heads/master' into cluster