Commit of 2.0RC1 merging Fix-1f with master
committed additional 2.0RC1 files