merged to 1.3.8