Modifications fot testing.
Merge commit '3eec7da8876796606ab33f315d00f403281a9eea' into manfred
Merge remote-tracking branch 'origin/roland' into manfred
Modifications during test of formula engine
Merge remote-tracking branch 'origin/manfred' into roland