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