Merge "BUG-108: make sure we add proper attributes, too"