Merge "Support for multiple instances"