Merge "[RONs] Create progress style template wrapper" into main