Merge "Change saveAttributes implementation"