Merge "Update core widgets to save attribute source info."