Merge "Workaround for empty repeated proto" into sc-dev