changed related to eliminating .files in SA
Merge origin/master