Merge "Add production GEEK validation code"