Integrate config file
Merge branch 'release/v2.4.2'