merge latest pei2nd commits