addresses Issue 3380327 and 3318938