merge 5.2.3