Grammar extension: allow secondary data object
Merge branch 'develop' into develop-1.7.3
Merge branch 'develop-1.7.3' into develop
vesion change to 1.7.4, add testcase again which sneaed in prematurely