Changes that must be merged later...
Merge branch 'roland_test' into roland