Merge pull request #378 from JCgH4164838Gh792C124B5/local_25x_CfgChg1

Minor follow-up changes to PR #371