New code as of 8.0.b1 to master

Trying to Merge files to Master from j3.0dev brach.