Merge branch 'master' into elk-parent-datatypes. Some incremental tests are ignored for now