GITBUG: Fixing Duplicate files in Git Repository
Merge branch '5.3_Release'