Merge "adding save automatic with import"