DEV 10398: Review 1