Cherry-pick 778713a atop 2c8ed76 as well