397.41 diffmerge pass against 406.06 dev branch - final