397.39 diffmerge pass against 406.06 dev branch
397.40 diffmerge pass against 406.06 dev branch - mostly homing