upstream 4.1.6 changes