Merge rel-4-0-patches into umobile_trunk