merge v5.3.2