Merge with 2.0-ongoing R2988