Merge remote-tracking branch 'origin/roland' into manfred
Slight extension of MessageProvider
clean up formula