Merge "Designer component changes"