merged changes from trunk - spec files harmonized