Merge "Add production GEEK validation code" into sc-dev