Sync files from debugging branch.