merge fix for modal popup test