merge v5.4.3 (again)