Merge "Re-enable empty damage drop optimization"