Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DNS-SD] Common Resolution Data such as the idle interval, active int… #35650

Merged

Conversation

vivien-apple
Copy link
Contributor

…erval, etc... are ignored by the dnssd platform discovery code when a commissionable node is discovered

Problem

By altering the logs (#35649) used with the ReliableMessageMgr I found out that #33025 has regressed the discovery code such that the some of the values advertise by accessories are ignored.

The list of ignored values are:

  • Session Idle Interval
  • Session Active Interval
  • Session Active Threshold
  • TCP Supported
  • Long Idle Time ICD

Concretely it means the the PBKDFParamRequest use to establish a PASE session defaults to the default MRP values defined in the spec, not the one advertised by the accessory.

…erval, etc... are ignored by the dnssd platform discovery code when a commissionable node is discovered
@vivien-apple vivien-apple self-assigned this Sep 18, 2024
Copy link

Review changes with SemanticDiff.

Copy link
Contributor

@bzbarsky-apple bzbarsky-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yikes, good catch!

Copy link

github-actions bot commented Sep 18, 2024

PR #35650: Size comparison from 2396bb4 to 40ad4dd

Full report (82 builds for bl602, bl702, bl702l, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 2396bb42 40ad4dd change % change
bl602 lighting-app bl602 FLASH 1277856 1277876 20 0.0
RAM 95824 95824 0 0.0
bl602+mfd FLASH 1291966 1291986 20 0.0
RAM 95968 95968 0 0.0
bl602+rpc FLASH 1317068 1317088 20 0.0
RAM 104248 104248 0 0.0
bl702 lighting-app bl702 FLASH 943784 943808 24 0.0
RAM 15145 15145 0 0.0
bl702+mfd FLASH 946184 946208 24 0.0
RAM 15305 15305 0 0.0
bl702+rpc FLASH 1039104 1039128 24 0.0
RAM 24173 24173 0 0.0
bl706-eth FLASH 645980 646014 34 0.0
RAM 25233 25233 0 0.0
bl706-wifi FLASH 893736 893768 32 0.0
RAM 14477 14477 0 0.0
bl702l lighting-app bl702l FLASH 960444 960468 24 0.0
RAM 16804 16804 0 0.0
bl702l+mfd FLASH 963066 963090 24 0.0
RAM 16964 16964 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 677269 677277 8 0.0
RAM 78492 78492 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 697121 697129 8 0.0
RAM 81124 81124 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 697121 697129 8 0.0
RAM 81124 81124 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 654049 654057 8 0.0
RAM 73560 73560 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 613341 613349 8 0.0
RAM 71452 71452 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 632977 632985 8 0.0
RAM 74004 74004 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 632977 632985 8 0.0
RAM 74004 74004 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 632589 632597 8 0.0
RAM 74500 74500 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 652297 652305 8 0.0
RAM 77052 77052 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 652297 652305 8 0.0
RAM 77052 77052 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 608005 608013 8 0.0
RAM 68588 68588 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 627857 627865 8 0.0
RAM 71220 71220 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 627857 627865 8 0.0
RAM 71220 71220 0 0.0
efr32 lighting-app BRD4187C FLASH 932380 932380 0 0.0
RAM 135056 135056 0 0.0
lock-app BRD2605a FLASH 739960 739968 8 0.0
RAM 231212 231212 0 0.0
BRD4338a FLASH 740608 740616 8 0.0
RAM 231244 231244 0 0.0
window-app BRD4187C FLASH 1015544 1015536 -8 -0.0
RAM 126996 126996 0 0.0
esp32 all-clusters-app c3devkit DRAM 94064 94064 0 0.0
FLASH 1537046 1537076 30 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115008 115008 0 0.0
FLASH 1547502 1547518 16 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4688 4688 0 0.0
FLASH 2772147 2772173 26 0.0
RAM 128944 128944 0 0.0
all-clusters-app debug unknown 5456 5456 0 0.0
FLASH 6074318 6074344 26 0.0
RAM 506928 506928 0 0.0
all-clusters-minimal-app debug unknown 5352 5352 0 0.0
FLASH 5407696 5407722 26 0.0
RAM 240640 240640 0 0.0
bridge-app debug unknown 5336 5336 0 0.0
FLASH 4741208 4741234 26 0.0
RAM 217840 217840 0 0.0
chip-tool debug unknown 5888 5888 0 0.0
FLASH 12540702 12540728 26 0.0
RAM 554506 554506 0 0.0
chip-tool-ipv6only arm64 unknown 20320 20320 0 0.0
FLASH 11240596 11240612 16 0.0
RAM 604560 604560 0 0.0
fabric-admin debug unknown 5720 5720 0 0.0
FLASH 10893843 10893869 26 0.0
RAM 553546 553546 0 0.0
fabric-bridge-app debug unknown 4568 4568 0 0.0
FLASH 4563946 4563972 26 0.0
RAM 204456 204456 0 0.0
lighting-app debug+rpc+ui unknown 5984 5984 0 0.0
FLASH 5677521 5677553 32 0.0
RAM 228128 228128 0 0.0
lock-app debug unknown 5272 5272 0 0.0
FLASH 4790488 4790514 26 0.0
RAM 203928 203928 0 0.0
ota-provider-app debug unknown 4648 4648 0 0.0
FLASH 4423674 4423700 26 0.0
RAM 197632 197632 0 0.0
ota-requestor-app debug unknown 4584 4584 0 0.0
FLASH 4562420 4562446 26 0.0
RAM 202200 202200 0 0.0
shell debug unknown 4216 4216 0 0.0
FLASH 3102941 3102973 32 0.0
RAM 158712 158712 0 0.0
thermostat-no-ble arm64 unknown 9336 9336 0 0.0
FLASH 4334076 4334092 16 0.0
RAM 242256 242256 0 0.0
tv-app debug unknown 5552 5552 0 0.0
FLASH 6019749 6019765 16 0.0
RAM 580464 580464 0 0.0
tv-casting-app debug unknown 5208 5208 0 0.0
FLASH 10747277 10747309 32 0.0
RAM 642384 642384 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 912968 912976 8 0.0
RAM 142175 142175 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 884748 884776 28 0.0
RAM 140314 140314 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 846476 846484 8 0.0
RAM 141077 141077 0 0.0
nxp contact k32w0+release FLASH 581544 581544 0 0.0
RAM 70768 70768 0 0.0
k32w1+release FLASH 594008 594016 8 0.0
RAM 62944 62944 0 0.0
mcxw71+release FLASH 593760 593768 8 0.0
RAM 62944 62944 0 0.0
light k32w0+release FLASH 617388 617388 0 0.0
RAM 70224 70224 0 0.0
k32w1+release FLASH 680584 680592 8 0.0
RAM 48560 48560 0 0.0
mcxw71+release FLASH 680600 680608 8 0.0
RAM 48560 48560 0 0.0
lock k32w1+release FLASH 702576 702584 8 0.0
RAM 67076 67076 0 0.0
mcxw71+release FLASH 702600 702608 8 0.0
RAM 67076 67076 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1644548 1644564 16 0.0
RAM 210864 210864 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1550556 1550572 16 0.0
RAM 207664 207664 0 0.0
light cy8ckit_062s2_43012 FLASH 1466372 1466372 0 0.0
RAM 200672 200672 0 0.0
lock cy8ckit_062s2_43012 FLASH 1462988 1463004 16 0.0
RAM 225024 225024 0 0.0
qpg lighting-app qpg6105+debug FLASH 659104 659112 8 0.0
RAM 105212 105212 0 0.0
lock-app qpg6105+debug FLASH 616996 617004 8 0.0
RAM 99688 99688 0 0.0
stm32 light STM32WB5MM-DK FLASH 480576 480584 8 0.0
RAM 144668 144668 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 621702 621726 24 0.0
RAM 50964 50964 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 686942 686976 34 0.0
RAM 148304 148304 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 779886 779910 24 0.0
RAM 110756 110756 0 0.0
bridge-app tlsr9258a FLASH 680722 680746 24 0.0
RAM 91620 91620 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 621466 621490 24 0.0
RAM 50916 50916 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 707372 707396 24 0.0
RAM 74256 74256 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 624620 624654 34 0.0
RAM 144292 144292 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 810028 810052 24 0.0
RAM 99424 99424 0 0.0
lock-app-dfu tlsr9528a FLASH 655218 655242 24 0.0
RAM 66976 66976 0 0.0
ota-requestor-app tlsr9258a FLASH 696698 696722 24 0.0
RAM 91212 91212 0 0.0
pump-app-usb tlsr9518adk80d FLASH 633054 633078 24 0.0
RAM 55792 55792 0 0.0
pump-controller-app tlsr9518adk80d FLASH 610244 610268 24 0.0
RAM 53036 53036 0 0.0
shell tlsr9518adk80d FLASH 467170 467194 24 0.0
RAM 68668 68668 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 628430 628454 24 0.0
RAM 52636 52636 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 652380 652404 24 0.0
RAM 56584 56584 0 0.0
thermostat tlsr9518adk80d FLASH 636974 636998 24 0.0
RAM 53428 53428 0 0.0
window-covering tlsr9118bdk40d FLASH 523150 523184 34 0.0
RAM 97268 97268 0 0.0
tizen all-clusters-app arm unknown 4852 4852 0 0.0
FLASH 1720668 1720664 -4 -0.0
RAM 88952 88952 0 0.0
chip-tool-ubsan arm unknown 10252 10252 0 0.0
FLASH 17317338 17317394 56 0.0
RAM 7543536 7543576 40 0.0

@github-actions github-actions bot added the lib label Sep 18, 2024
@kiel-apple
Copy link
Contributor

updated to latest master so it will not bother with the OpenIoT check (all others passed)

Copy link

github-actions bot commented Sep 18, 2024

PR #35650: Size comparison from 0d17a40 to e70b44b

Full report (82 builds for bl602, bl702, bl702l, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 0d17a40 e70b44b change % change
bl602 lighting-app bl602 FLASH 1279984 1280004 20 0.0
RAM 95848 95848 0 0.0
bl602+mfd FLASH 1294106 1294126 20 0.0
RAM 95992 95992 0 0.0
bl602+rpc FLASH 1319196 1319216 20 0.0
RAM 104272 104272 0 0.0
bl702 lighting-app bl702 FLASH 944100 944124 24 0.0
RAM 15145 15145 0 0.0
bl702+mfd FLASH 946500 946524 24 0.0
RAM 15305 15305 0 0.0
bl702+rpc FLASH 1039420 1039444 24 0.0
RAM 24173 24173 0 0.0
bl706-eth FLASH 646296 646330 34 0.0
RAM 25233 25233 0 0.0
bl706-wifi FLASH 894372 894404 32 0.0
RAM 14477 14477 0 0.0
bl702l lighting-app bl702l FLASH 960760 960784 24 0.0
RAM 16804 16804 0 0.0
bl702l+mfd FLASH 963382 963406 24 0.0
RAM 16964 16964 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 677613 677621 8 0.0
RAM 78516 78516 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 697465 697473 8 0.0
RAM 81148 81148 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 697465 697473 8 0.0
RAM 81148 81148 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 654393 654401 8 0.0
RAM 73584 73584 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 613653 613661 8 0.0
RAM 71468 71468 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 633281 633289 8 0.0
RAM 74020 74020 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 633281 633289 8 0.0
RAM 74020 74020 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 632909 632917 8 0.0
RAM 74516 74516 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 652617 652625 8 0.0
RAM 77068 77068 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 652617 652625 8 0.0
RAM 77068 77068 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 608317 608325 8 0.0
RAM 68604 68604 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 628177 628185 8 0.0
RAM 71236 71236 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 628177 628185 8 0.0
RAM 71236 71236 0 0.0
efr32 lighting-app BRD4187C FLASH 932700 932700 0 0.0
RAM 135080 135080 0 0.0
lock-app BRD2605a FLASH 740504 740512 8 0.0
RAM 231220 231220 0 0.0
BRD4338a FLASH 741152 741160 8 0.0
RAM 231252 231252 0 0.0
window-app BRD4187C FLASH 1016048 1016040 -8 -0.0
RAM 127004 127004 0 0.0
esp32 all-clusters-app c3devkit DRAM 94080 94080 0 0.0
FLASH 1537360 1537390 30 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115032 115032 0 0.0
FLASH 1547798 1547814 16 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4688 4688 0 0.0
FLASH 2764181 2764207 26 0.0
RAM 129424 129424 0 0.0
all-clusters-app debug unknown 5456 5456 0 0.0
FLASH 6066320 6066346 26 0.0
RAM 507360 507360 0 0.0
all-clusters-minimal-app debug unknown 5352 5352 0 0.0
FLASH 5399652 5399678 26 0.0
RAM 241136 241136 0 0.0
bridge-app debug unknown 5336 5336 0 0.0
FLASH 4733208 4733234 26 0.0
RAM 218304 218304 0 0.0
chip-tool debug unknown 5888 5888 0 0.0
FLASH 12544540 12544566 26 0.0
RAM 555058 555058 0 0.0
chip-tool-ipv6only arm64 unknown 20400 20400 0 0.0
FLASH 11242996 11243012 16 0.0
RAM 605144 605144 0 0.0
fabric-admin debug unknown 5720 5720 0 0.0
FLASH 10902985 10903011 26 0.0
RAM 554234 554234 0 0.0
fabric-bridge-app debug unknown 4568 4568 0 0.0
FLASH 4555868 4555894 26 0.0
RAM 204888 204888 0 0.0
lighting-app debug+rpc+ui unknown 5984 5984 0 0.0
FLASH 5669441 5669473 32 0.0
RAM 228560 228560 0 0.0
lock-app debug unknown 5272 5272 0 0.0
FLASH 4782412 4782438 26 0.0
RAM 204376 204376 0 0.0
ota-provider-app debug unknown 4648 4648 0 0.0
FLASH 4415596 4415622 26 0.0
RAM 198112 198112 0 0.0
ota-requestor-app debug unknown 4584 4584 0 0.0
FLASH 4554344 4554370 26 0.0
RAM 202680 202680 0 0.0
shell debug unknown 4216 4216 0 0.0
FLASH 3094877 3094893 16 0.0
RAM 159184 159184 0 0.0
thermostat-no-ble arm64 unknown 9392 9392 0 0.0
FLASH 4326820 4326836 16 0.0
RAM 242664 242664 0 0.0
tv-app debug unknown 5552 5552 0 0.0
FLASH 6011541 6011573 32 0.0
RAM 580896 580896 0 0.0
tv-casting-app debug unknown 5208 5208 0 0.0
FLASH 10739405 10739421 16 0.0
RAM 642976 642976 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 913292 913300 8 0.0
RAM 142199 142199 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 884992 885016 24 0.0
RAM 140338 140338 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 846804 846812 8 0.0
RAM 141093 141093 0 0.0
nxp contact k32w0+release FLASH 581760 581760 0 0.0
RAM 70776 70776 0 0.0
k32w1+release FLASH 594216 594224 8 0.0
RAM 62952 62952 0 0.0
mcxw71+release FLASH 593976 593984 8 0.0
RAM 62952 62952 0 0.0
light k32w0+release FLASH 617620 617636 16 0.0
RAM 70248 70248 0 0.0
k32w1+release FLASH 680856 680864 8 0.0
RAM 48584 48584 0 0.0
mcxw71+release FLASH 680872 680880 8 0.0
RAM 48584 48584 0 0.0
lock k32w1+release FLASH 702840 702848 8 0.0
RAM 67084 67084 0 0.0
mcxw71+release FLASH 702864 702872 8 0.0
RAM 67084 67084 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1645108 1645124 16 0.0
RAM 210888 210888 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1551108 1551108 0 0.0
RAM 207688 207688 0 0.0
light cy8ckit_062s2_43012 FLASH 1466924 1466924 0 0.0
RAM 200696 200696 0 0.0
lock cy8ckit_062s2_43012 FLASH 1463540 1463556 16 0.0
RAM 225048 225048 0 0.0
qpg lighting-app qpg6105+debug FLASH 659368 659376 8 0.0
RAM 105236 105236 0 0.0
lock-app qpg6105+debug FLASH 617252 617260 8 0.0
RAM 99704 99704 0 0.0
stm32 light STM32WB5MM-DK FLASH 480904 480912 8 0.0
RAM 144692 144692 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 621936 621960 24 0.0
RAM 50988 50988 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 687178 687212 34 0.0
RAM 148328 148328 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 780122 780146 24 0.0
RAM 110780 110780 0 0.0
bridge-app tlsr9258a FLASH 680958 680982 24 0.0
RAM 91644 91644 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 621700 621724 24 0.0
RAM 50940 50940 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 707608 707632 24 0.0
RAM 74280 74280 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 624856 624890 34 0.0
RAM 144316 144316 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 810264 810288 24 0.0
RAM 99448 99448 0 0.0
lock-app-dfu tlsr9528a FLASH 655454 655478 24 0.0
RAM 67000 67000 0 0.0
ota-requestor-app tlsr9258a FLASH 696934 696958 24 0.0
RAM 91236 91236 0 0.0
pump-app-usb tlsr9518adk80d FLASH 633290 633314 24 0.0
RAM 55816 55816 0 0.0
pump-controller-app tlsr9518adk80d FLASH 610480 610504 24 0.0
RAM 53060 53060 0 0.0
shell tlsr9518adk80d FLASH 467170 467194 24 0.0
RAM 68668 68668 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 628666 628690 24 0.0
RAM 52660 52660 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 652616 652640 24 0.0
RAM 56608 56608 0 0.0
thermostat tlsr9518adk80d FLASH 637210 637234 24 0.0
RAM 53452 53452 0 0.0
window-covering tlsr9118bdk40d FLASH 523386 523420 34 0.0
RAM 97284 97284 0 0.0
tizen all-clusters-app arm unknown 4876 4876 0 0.0
FLASH 1721832 1721828 -4 -0.0
RAM 89084 89084 0 0.0
chip-tool-ubsan arm unknown 10276 10276 0 0.0
FLASH 17345290 17345346 56 0.0
RAM 7556512 7556552 40 0.0

@pullapprove pullapprove bot requested a review from jtov-sfy September 19, 2024 21:33
@mergify mergify bot merged commit 8f7d74d into project-chip:master Sep 20, 2024
68 checks passed
nivi-apple pushed a commit to nivi-apple/connectedhomeip that referenced this pull request Sep 24, 2024
…erval, etc... are ignored by the dnssd platform discovery code when a commissionable node is discovered (project-chip#35650)

Co-authored-by: Kiel Oleson <[email protected]>
nivi-apple pushed a commit to nivi-apple/connectedhomeip that referenced this pull request Sep 24, 2024
…erval, etc... are ignored by the dnssd platform discovery code when a commissionable node is discovered (project-chip#35650)

Co-authored-by: Kiel Oleson <[email protected]>
yyzhong-g pushed a commit to yyzhong-g/connectedhomeip that referenced this pull request Dec 12, 2024
…erval, etc... are ignored by the dnssd platform discovery code when a commissionable node is discovered (project-chip#35650)

Co-authored-by: Kiel Oleson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants