Merge change on master back to develop#70

Siebje merged 4 commits intodevelopKeysight/java-trsfile:developfrom

mergebackKeysight/java-trsfile:mergebackCopy head branch name to clipboard