update from 4.3 -> 4.4, and from trunk -> master >> master