added testcase for ticket 2695
reorganize Data handling from transformer
Merge branch '4.1' into 4.2

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.