Fixed message() use in Domain objects
Some more minor fixes
gMerge branch '4.2-maint' into newdev