Changes to get files from main repository.
Five new files have gotten from main trunk.
Merge branch 'develop' into ReetiMirroring002-RFT007