Merge "Fix attribute validation"