fix configuration
Merge branch 'R01040x-branch'