Fix ordering of begin/end blocker to match rc2. (#1924)

Fix ordering of begin/end blocker to match rc2. (#1924) #161