Merge branch '4650_shift_f4_segfault'