merge v3.5.4 changes