Please consider mainline commit 9393c8de628c for stable