Pre-Merge 02

Preparing for the second merge.