Merge "Fix for item alignment."