More changes for tag 4.4.3