Drop #1052845 by @HBVarun