refactoring and added reproducer for BZ 1094798