Merge "Support multiple customer instantiation"