Merge files from Alex's branch.