118092-suggestion-for-future-drops-and-bug-fixs