Border-radius changes from upstream projects