several branches merged into OpenPetra trunk 2452