Merge branch 'trunk' into fix-azure-list-nodes