Add OpenFileClass
Add OpenFilePackage
Merge remote-tracking branch 'origin/OpenFileBranch' into OpenFileBranch