Merge "Make AttributedOpEntry gracefully handle empty array" into sc-dev