Merge branch 'trunk' into OAK-9717