Fixed message() use in Domain objects
Merge branch 'rescoped_4_2-maint' into test