Merge "Initialize a present fence in case of failure" into main