Trunk 3883

added some changes