Es 1.2

merge regexp issue