Drop #1113523 by @pelingenc