Merge "Fixing NPE crash in BF." into nyc-support-24.1-dev