Merge pull request #2567 from castillofrancodamian/bcp38