Merge "BUG-865: get rid of InstanceIdentifier-related warnings"