Drop #1043091 by @matman