Merge from Origin/J3.0dev