Merged from v1.81 and fixed conflicts