Fixed rounded corners, [branch: dev1.1]