merge upstream 4.4.1 tags and ste defines