Merge Initial from Eclipse to Master

Complete merge.