Merge "Eliminating the “black hole” effect with location/drop events." into nyc-mr1-dev