Removed getting map files not found issue
Merge branch 'testing' into develop