Merge "BUG-592: Fix InstanceIdentifier instantiation"