Trunk 3094 updated

I have changed the necessary files, please review it.