merging changes from cr-xq-dev - mainly data-view