merged with patch1