047.02 sync w/435.18; updates to config and related areas