Drop #993614 by @EstebanAmaro