merge StudIP2.5-compatibility version into master