377.07a back-ported changes to 2 settings files