Added new files from main trunk.