Merge "BUG 340: Resolved instance-identifier translation in JSON"