Cherry-picked and pushed to stable: eea414515db8..4a049a575434 stable^ -> stable Older distros won't be changed, so closing.