Merge branch 'master' into nodeDescriptor_names_ext