merge v5.4 config