merge selected patches from milepost-integration: