Merge pull request #9488 from jflyper/bfdev-use-library-symbol-for-uid-base