Merge pull request #1905 from ldir-EDB0/bcp38