Trunk 2975

added some changes