Merge "Add read barrier option to UpdateEntrypoints"