! Port some 2.3.6 changes over