Re-sync of Master

Error in local file handling - no changes