This patch has no functional change, it only changes the procedure for
easier modification of configuration items.