Merge "Instance identifier support"