20140930 - Merging first before continuing synch-up