Merge "Do not remove handlers for loaders." into nyc-mr1-dev