STM32WB5MM OTA integration bborts during FUOTA

[stmhsi]

I'm working on a custom board based on a STM32WB5MMGHX. I want to be able to update the firmware via OTA.

I've successfully been able to follow AN5247 with a nucleo dev kit to switch between the HeartRate and p2pServer examples. I did this both using the phone App and STM32CubeMonitor-RF with the dongle. I was also able to get the example applications to update on my board. When I attempt to incorporate the examples into an existing project for my board, I am unable to get FUOTA to work. 

I've confirmed the memory adjustments (configured using CubeMX) are correct by looking at the Build Analyzer's Memory Regions and Memory Details.

At the end of the linker script I had to manually add this line "TAG_OTA_END(NOLOAD) : { KEEP (*(TAG_OTA_END)) } >FLASH". If I make changes in CubeMx and allow it to generate code, that line gets removed. Is there a way to set that in CubeMx so that it doesn't keep getting deleted?

I've checked that the magic number is showing up in the expected spot by using STM32Programmer.

Using CubeMx, I've configured the Reboot Request Characteristic based on the app note (screenshot attached) and in app_conf.h I changed BLE_CFG_OTA_REBOOT_CHAR to a value of 1. After doing this, I noticed that the second character of the advertising name gets overwritten with a space character. Is there a way to prevent this from happening?

With the example applications, when I use CubeMonitor-RF to search for devices, I can leave the Advertising Filter box checked and they show up fine, with 'OTA Enabled' appended to the end of the name. Using my modified application, I need to uncheck the Advertising Filter box and the device does not have 'OTA Enabled' appended to the end. I can select the device running my application, choose the binary and hit update, but after a few seconds, the update aborts (screenshot attached). I attempted to follow the app note's instructions for updating the advertising data, but I was unsure of how the app note's tables in section 3.2.3 translate to the CubeMx fields.

Resources I've Followed:

App Note AN5247: https://www.st.com/resource/en/application_note/an5247-overtheair-application-and-wireless-firmware-update-for-stm32wb-series-microcontrollers-stmicroelectronics.pdf

STM32WB Getting Started Series (entire series, but specifically parts 7 and 7A): https://www.youtube.com/watch?v=mRzZOa3jmuM&list=PLnMKNibPkDnG9JRe2fbOOpVpWY7E4WbJ-&index=12

MOOC STM32WB Firmware Update Over the Air Series: https://www.youtube.com/playlist?list=PLnMKNibPkDnHCD2Xc_xX-nWR7AoWBPK2Q

STM32 Wiki for FUOTA: https://wiki.stmicroelectronics.cn/stm32mcu/wiki/Connectivity:STM32WB_Fast_FUOTA

Are there additional resources that help explain integrating FUOTA into an existing project?

Is there a better explanation for how to use CubeMx to configure the reboot characteristic, advertising data or OTA regions?

Thank you