Small errors do to standards.
Merge remote-tracking branch 'origin/j3.0dev' into j3.0dev