Drop #1058703 by @Veerendra