supurrt otp 18#13

276361270 wants to merge 3 commits into

erlware:mastererlware/resource_discovery:masterfrom

276361270:master276361270/resource_discovery:masterCopy head branch name to clipboard