Pre-merge adjustments for master.
Added: Premerge code for master.