Merge branch '2663_background_segfault'