merge with 1.3 edited