[rt3/f17] (5 commits) ...Merge cleanup.