Support ER2 build