Merge untampered R9 and current head. Somehow had reverted most files in
a commit since that one.
Fix accidental double from merging