Use uat branch of S2Mapper